const Gio = imports.gi.Gio;
const Gtk = imports.gi.Gtk;
const Mainloop = imports.mainloop;
+const Pango = imports.gi.Pango;
const Shell = imports.gi.Shell;
const Signals = imports.signals;
const Lang = imports.lang;
const DEFAULT_PADDING = 4;
const DASH_SECTION_PADDING = 6;
-const DASH_SECTION_SPACING = 12;
+const DASH_SECTION_SPACING = 40;
const DASH_CORNER_RADIUS = 5;
-const DASH_SEARCH_BG_COLOR = new Clutter.Color();
-DASH_SEARCH_BG_COLOR.from_pixel(0xffffffff);
-const DASH_SECTION_COLOR = new Clutter.Color();
-DASH_SECTION_COLOR.from_pixel(0x846c3dff);
-const DASH_TEXT_COLOR = new Clutter.Color();
-DASH_TEXT_COLOR.from_pixel(0xffffffff);
+
+const BACKGROUND_COLOR = new Clutter.Color();
+BACKGROUND_COLOR.from_pixel(0x000000c0);
+
+const DASH_PADDING_SIDE = 14;
+
+const SEARCH_BORDER_BOTTOM_COLOR = new Clutter.Color();
+SEARCH_BORDER_BOTTOM_COLOR.from_pixel(0x191919ff);
+
+const SECTION_BORDER_COLOR = new Clutter.Color();
+SECTION_BORDER_COLOR.from_pixel(0x262626ff);
+const SECTION_BORDER = 1;
+const SECTION_INNER_BORDER_COLOR = new Clutter.Color();
+SECTION_INNER_BORDER_COLOR.from_pixel(0x000000ff);
+const SECTION_BACKGROUND_TOP_COLOR = new Clutter.Color();
+SECTION_BACKGROUND_TOP_COLOR.from_pixel(0x161616ff);
+const SECTION_BACKGROUND_BOTTOM_COLOR = new Clutter.Color();
+SECTION_BACKGROUND_BOTTOM_COLOR.from_pixel(0x000000ff);
+const SECTION_INNER_SPACING = 8;
+
+const BROWSE_ACTIVATED_BG = new Clutter.Color();
+BROWSE_ACTIVATED_BG.from_pixel(0x303030f0);
+
+const TEXT_COLOR = new Clutter.Color();
+TEXT_COLOR.from_pixel(0x5f5f5fff);
+const BRIGHT_TEXT_COLOR = new Clutter.Color();
+BRIGHT_TEXT_COLOR.from_pixel(0xffffffff);
const PANE_BORDER_COLOR = new Clutter.Color();
PANE_BORDER_COLOR.from_pixel(0x101d3cfa);
// Utility function shared between ResultPane and the DocDisplay in the main dash.
// Connects to the detail signal of the display, and on-demand creates a new
// pane.
-function createPaneForDetails(dash, display, detailsWidth) {
+function createPaneForDetails(dash, display) {
let detailPane = null;
display.connect('show-details', Lang.bind(this, function(display, index) {
if (detailPane == null) {
if (index >= 0) {
detailPane.destroyContent();
- let details = display.createDetailsForIndex(index, detailsWidth, -1);
+ let details = display.createDetailsForIndex(index, -1);
detailPane.content.append(details, Big.BoxPackFlags.EXPAND);
detailPane.open();
} else {
return null;
}
-function ResultPane(dash, detailsWidth) {
- this._init(dash, detailsWidth);
+function ResultPane(dash) {
+ this._init(dash);
}
ResultPane.prototype = {
__proto__: Pane.prototype,
- _init: function(dash, detailsWidth) {
+ _init: function(dash) {
Pane.prototype._init.call(this);
this._dash = dash;
- this._detailsWidth = detailsWidth;
},
// Create an instance of displayClass and pack it into this pane's
packResults: function(displayClass, enableNavigation) {
let resultArea = new ResultArea(displayClass, enableNavigation);
- createPaneForDetails(this._dash, resultArea.display, this._detailsWidth);
+ createPaneForDetails(this._dash, resultArea.display);
this.content.append(resultArea.actor, Big.BoxPackFlags.EXPAND);
this.connect('open-state-changed', Lang.bind(this, function(pane, isOpen) {
_init : function() {
this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
y_align: Big.BoxAlignment.CENTER,
- background_color: DASH_SEARCH_BG_COLOR,
- corner_radius: 4,
- spacing: DEFAULT_PADDING,
- padding: DEFAULT_PADDING
- });
-
- let icon = new Gio.ThemedIcon({ name: 'gtk-find' });
- let searchIconTexture = Shell.TextureCache.get_default().load_gicon(icon, 16);
- this.actor.append(searchIconTexture, Big.BoxPackFlags.NONE);
-
+ border_bottom: SECTION_BORDER,
+ border_color: SEARCH_BORDER_BOTTOM_COLOR });
this.pane = null;
+ this._defaultText = "Find apps or documents";
+
+ let textProperties = { font_name: "Sans 12" };
+ let entryProperties = { editable: true,
+ activatable: true,
+ single_line_mode: true,
+ color: BRIGHT_TEXT_COLOR,
+ cursor_color: BRIGHT_TEXT_COLOR,
+ text: '' };
+ Lang.copyProperties(textProperties, entryProperties);
// We need to initialize the text for the entry to have the cursor displayed
// in it. See http://bugzilla.openedhand.com/show_bug.cgi?id=1365
- this.entry = new Clutter.Text({ font_name: "Sans 14px",
- editable: true,
- activatable: true,
- singleLineMode: true,
- text: ""
- });
+ this.entry = new Clutter.Text(entryProperties);
+ this.entry.connect('notify::text', Lang.bind(this, function () {
+ this._resetTextState();
+ }));
this.actor.append(this.entry, Big.BoxPackFlags.EXPAND);
+
+ // Mark as editable just to get a cursor
+ let defaultTextProperties = { ellipsize: Pango.EllipsizeMode.END,
+ text: "Find apps or documents",
+ editable: true,
+ color: TEXT_COLOR,
+ cursor_visible: false,
+ single_line_mode: true };
+ Lang.copyProperties(textProperties, defaultTextProperties);
+ this._defaultText = new Clutter.Text(defaultTextProperties);
+ this.actor.add_actor(this._defaultText);
+ this.entry.connect('notify::allocation', Lang.bind(this, function () {
+ this._repositionDefaultText();
+ }));
+
+ this._iconBox = new Big.Box({ x_align: Big.BoxAlignment.CENTER,
+ y_align: Big.BoxAlignment.CENTER });
+ this.actor.append(this._iconBox, Big.BoxPackFlags.END);
+
+ let global = Shell.Global.get();
+ let magnifierUri = "file://" + global.imagedir + "magnifier.svg";
+ this._magnifierIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
+ magnifierUri, 29, 18);
+ let closeUri = "file://" + global.imagedir + "close.svg";
+ this._closeIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
+ closeUri, 18, 18);
+ this._closeIcon.reactive = true;
+ this._closeIcon.connect('button-press-event', Lang.bind(this, function () {
+ this.entry.text = '';
+ }));
+ this._repositionDefaultText();
+ this._resetTextState();
},
setPane: function (pane) {
this._pane = pane;
+ },
+
+ reset: function () {
+ this.entry.text = '';
+ },
+
+ getText: function () {
+ return this.entry.text;
+ },
+
+ _resetTextState: function () {
+ let text = this.getText();
+ this._iconBox.remove_all();
+ if (text != '') {
+ this._defaultText.hide();
+ this._iconBox.append(this._closeIcon, Big.BoxPackFlags.NONE);
+ } else {
+ this._defaultText.show();
+ this._iconBox.append(this._magnifierIcon, Big.BoxPackFlags.NONE);
+ }
+ },
+
+ _repositionDefaultText: function () {
+ // Offset a little to show the cursor
+ this._defaultText.set_position(this.entry.x + 4, this.entry.y);
+ this._defaultText.set_size(this.entry.width, this.entry.height);
}
};
Signals.addSignalMethods(SearchEntry.prototype);
MoreLink.prototype = {
_init : function () {
this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+ padding_right: DEFAULT_PADDING,
padding_left: DEFAULT_PADDING,
- padding_right: DEFAULT_PADDING });
- let global = Shell.Global.get();
- let inactiveUri = "file://" + global.imagedir + "view-more.svg";
- let activeUri = "file://" + global.imagedir + "view-more-activated.svg";
- this._inactiveIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
- inactiveUri, 29, 18);
- this._activeIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
- activeUri, 29, 18);
- this._iconBox = new Big.Box({ reactive: true });
- this._iconBox.append(this._inactiveIcon, Big.BoxPackFlags.NONE);
- this.actor.append(this._iconBox, Big.BoxPackFlags.END);
-
+ reactive: true,
+ x_align: Big.BoxAlignment.CENTER,
+ y_align: Big.BoxAlignment.CENTER,
+ border_left: SECTION_BORDER,
+ border_color: SECTION_BORDER_COLOR });
this.pane = null;
- this._iconBox.connect('button-press-event', Lang.bind(this, function (b, e) {
+ let text = new Clutter.Text({ font_name: "Sans 12px",
+ color: BRIGHT_TEXT_COLOR,
+ text: "Browse" });
+ this.actor.append(text, Big.BoxPackFlags.NONE);
+
+ this.actor.connect('button-press-event', Lang.bind(this, function (b, e) {
if (this.pane == null) {
// Ensure the pane is created; the activated handler will call setPane
this.emit('activated');
setPane: function (pane) {
this._pane = pane;
this._pane.connect('open-state-changed', Lang.bind(this, function(pane, isOpen) {
- this._iconBox.remove_all();
- this._iconBox.append(isOpen ? this._activeIcon : this._inactiveIcon,
- Big.BoxPackFlags.NONE);
}));
}
}
Signals.addSignalMethods(MoreLink.prototype);
-function SectionHeader(title) {
- this._init(title);
+function SectionHeader(title, suppressBrowse) {
+ this._init(title, suppressBrowse);
}
SectionHeader.prototype = {
- _init : function (title) {
- this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
- let text = new Clutter.Text({ color: DASH_SECTION_COLOR,
- font_name: "Sans Bold 10px",
+ _init : function (title, suppressBrowse) {
+ this.actor = new Big.Box({ border: SECTION_BORDER,
+ border_color: SECTION_BORDER_COLOR });
+ this._innerBox = new Big.Box({ border: SECTION_BORDER,
+ border_color: SECTION_INNER_BORDER_COLOR,
+ padding_left: DEFAULT_PADDING,
+ orientation: Big.BoxOrientation.HORIZONTAL });
+ this.actor.append(this._innerBox, Big.BoxPackFlags.EXPAND);
+ let backgroundGradient = Shell.create_vertical_gradient(SECTION_BACKGROUND_TOP_COLOR,
+ SECTION_BACKGROUND_BOTTOM_COLOR);
+ this._innerBox.add_actor(backgroundGradient);
+ this._innerBox.connect('notify::allocation', Lang.bind(this, function (actor) {
+ let [width, height] = actor.get_size();
+ backgroundGradient.set_size(width, height);
+ }));
+ let textBox = new Big.Box({ padding_top: DEFAULT_PADDING,
+ padding_bottom: DEFAULT_PADDING });
+ let text = new Clutter.Text({ color: TEXT_COLOR,
+ font_name: "Sans Bold 12px",
text: title });
- this.moreLink = new MoreLink();
- this.actor.append(text, Big.BoxPackFlags.EXPAND);
- this.actor.append(this.moreLink.actor, Big.BoxPackFlags.END);
+ textBox.append(text, Big.BoxPackFlags.NONE);
+ this._innerBox.append(textBox, Big.BoxPackFlags.EXPAND);
+ if (!suppressBrowse) {
+ this.moreLink = new MoreLink();
+ this._innerBox.append(this.moreLink.actor, Big.BoxPackFlags.END);
+ }
}
}
-function Dash(displayGridColumnWidth) {
- this._init(displayGridColumnWidth);
+function Section(titleString, suppressBrowse) {
+ this._init(titleString, suppressBrowse);
}
-Dash.prototype = {
- _init : function(displayGridColumnWidth) {
- this._width = displayGridColumnWidth;
+Section.prototype = {
+ _init: function(titleString, suppressBrowse) {
+ this.actor = new Big.Box({ spacing: SECTION_INNER_SPACING });
+ this.header = new SectionHeader(titleString, suppressBrowse);
+ this.actor.append(this.header.actor, Big.BoxPackFlags.NONE);
+ this.content = new Big.Box();
+ this.actor.append(this.content, Big.BoxPackFlags.EXPAND);
+ }
+}
- this._detailsWidth = displayGridColumnWidth * 2;
+function Dash() {
+ this._init();
+}
+Dash.prototype = {
+ _init : function() {
let global = Shell.Global.get();
// dash and the popup panes need to be reactive so that the clicks in unoccupied places on them
// of the Group actor ends up including the width of its hidden children, so we were getting a reactive object as
// wide as the details pane that was blocking the clicks to the workspaces underneath it even when the details pane
// was actually hidden.
- this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
- width: this._width,
- padding: DEFAULT_PADDING,
+ this.actor = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
+ background_color: BACKGROUND_COLOR,
+ corner_radius: DASH_CORNER_RADIUS,
+ padding_left: DASH_PADDING_SIDE,
+ padding_right: DASH_PADDING_SIDE,
reactive: true });
- this.dashContainer = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
- spacing: DASH_SECTION_SPACING });
- this.actor.append(this.dashContainer, Big.BoxPackFlags.EXPAND);
+ // Size for this one explicitly set from overlay.js
+ this.searchArea = new Big.Box({ y_align: Big.BoxAlignment.CENTER });
+
+ this.sectionArea = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
+ spacing: DASH_SECTION_SPACING });
+
+ this.actor.append(this.searchArea, Big.BoxPackFlags.NONE);
+ this.actor.append(this.sectionArea, Big.BoxPackFlags.NONE);
// The currently active popup display
this._activePane = null;
this._searchPane = null;
this._searchActive = false;
this._searchEntry = new SearchEntry();
- this.dashContainer.append(this._searchEntry.actor, Big.BoxPackFlags.NONE);
+ this.searchArea.append(this._searchEntry.actor, Big.BoxPackFlags.EXPAND);
this._searchAreaApps = null;
this._searchAreaDocs = null;
this._searchQueued = false;
this._searchEntry.entry.connect('text-changed', Lang.bind(this, function (se, prop) {
- this._searchActive = this._searchEntry.text != '';
+ let text = this._searchEntry.getText();
+ this._searchActive = text != '';
if (this._searchQueued)
return;
if (this._searchPane == null) {
- this._searchPane = new ResultPane(this, this._detailsWidth);
- this._searchPane.content.append(new Clutter.Text({ color: DASH_SECTION_COLOR,
+ this._searchPane = new ResultPane(this);
+ this._searchPane.content.append(new Clutter.Text({ color: TEXT_COLOR,
font_name: 'Sans Bold 10px',
text: "APPLICATIONS" }),
Big.BoxPackFlags.NONE);
this._searchAreaApps = this._searchPane.packResults(AppDisplay.AppDisplay, false);
- this._searchPane.content.append(new Clutter.Text({ color: DASH_SECTION_COLOR,
+ this._searchPane.content.append(new Clutter.Text({ color: TEXT_COLOR,
font_name: 'Sans Bold 10px',
text: "RECENT DOCUMENTS" }),
Big.BoxPackFlags.NONE);
}
this._searchQueued = true;
Mainloop.timeout_add(250, Lang.bind(this, function() {
+ let text = this._searchEntry.getText();
// Strip leading and trailing whitespace
- let text = this._searchEntry.entry.text.replace(/^\s+/g, "").replace(/\s+$/g, "");
+ text = text.replace(/^\s+/g, "").replace(/\s+$/g, "");
this._searchQueued = false;
this._searchAreaApps.setSearch(text);
this._searchAreaDocs.setSearch(text);
return true;
}));
this._searchEntry.entry.connect('key-press-event', Lang.bind(this, function (se, e) {
+ let text = this._searchEntry.getText();
let symbol = Shell.get_event_key_symbol(e);
if (symbol == Clutter.Escape) {
// Escape will keep clearing things back to the desktop. First, if
// we have active text, we remove it.
- if (this._searchEntry.entry.text != '')
- this._searchEntry.entry.text = '';
+ if (text != '')
+ this._searchEntry.reset();
// Next, if we're in one of the "more" modes or showing the details pane, close them
else if (this._activePane != null)
this._activePane.close();
/***** Applications *****/
- let appsHeader = new SectionHeader("APPLICATIONS");
- this._appsSection = new Big.Box({ spacing: DEFAULT_PADDING });
- this._appsSection.append(appsHeader.actor, Big.BoxPackFlags.NONE);
-
- this._appsContent = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
- this._appsSection.append(this._appsContent, Big.BoxPackFlags.EXPAND);
- this._appWell = new AppDisplay.AppWell();
- this._appsContent.append(this._appWell.actor, Big.BoxPackFlags.EXPAND);
+ let appsSection = new Section("APPLICATIONS");
+ let appWell = new AppDisplay.AppWell();
+ appsSection.content.append(appWell.actor, Big.BoxPackFlags.EXPAND);
this._moreAppsPane = null;
- appsHeader.moreLink.connect('activated', Lang.bind(this, function (link) {
+ appsSection.header.moreLink.connect('activated', Lang.bind(this, function (link) {
if (this._moreAppsPane == null) {
- this._moreAppsPane = new ResultPane(this, this._detailsWidth);
+ this._moreAppsPane = new ResultPane(this);
this._moreAppsPane.packResults(AppDisplay.AppDisplay, true);
this._addPane(this._moreAppsPane);
link.setPane(this._moreAppsPane);
}
}));
- this.dashContainer.append(this._appsSection, Big.BoxPackFlags.NONE);
+ this.sectionArea.append(appsSection.actor, Big.BoxPackFlags.NONE);
/***** Places *****/
- let placesSection = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
- spacing: DEFAULT_PADDING });
- let placesHeader = new SectionHeader("PLACES");
- placesSection.append(placesHeader.actor, Big.BoxPackFlags.NONE);
-
+ let placesSection = new Section("PLACES", true);
let placesDisplay = new Places.Places();
- placesSection.append(placesDisplay.actor, Big.BoxPackFlags.EXPAND);
-
- this.dashContainer.append(placesSection, Big.BoxPackFlags.NONE);
+ placesSection.content.append(placesDisplay.actor, Big.BoxPackFlags.EXPAND);
+ this.sectionArea.append(placesSection.actor, Big.BoxPackFlags.NONE);
/***** Documents *****/
- this._docsSection = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
- spacing: DEFAULT_PADDING });
- this._moreDocsPane = null;
-
- let docsHeader = new SectionHeader("RECENT DOCUMENTS");
- this._docsSection.append(docsHeader.actor, Big.BoxPackFlags.NONE);
-
- this._docDisplay = new DocDisplay.DocDisplay();
- this._docDisplay.load();
- this._docsSection.append(this._docDisplay.actor, Big.BoxPackFlags.EXPAND);
+ let docsSection = new Section("RECENT DOCUMENTS");
- createPaneForDetails(this, this._docDisplay, this._detailsWidth);
+ let docDisplay = new DocDisplay.DocDisplay();
+ docDisplay.load();
+ docsSection.content.append(docDisplay.actor, Big.BoxPackFlags.EXPAND);
+ createPaneForDetails(this, docDisplay);
- docsHeader.moreLink.connect('activated', Lang.bind(this, function (link) {
+ this._moreDocsPane = null;
+ docsSection.header.moreLink.connect('activated', Lang.bind(this, function (link) {
if (this._moreDocsPane == null) {
- this._moreDocsPane = new ResultPane(this, this._detailsWidth);
+ this._moreDocsPane = new ResultPane(this);
this._moreDocsPane.packResults(DocDisplay.DocDisplay, true);
this._addPane(this._moreDocsPane);
link.setPane(this._moreDocsPane);
}
}));
- this.dashContainer.append(this._docsSection, Big.BoxPackFlags.EXPAND);
+ this.sectionArea.append(docsSection.actor, Big.BoxPackFlags.EXPAND);
},
show: function() {
},
hide: function() {
- this._firstSelectAfterOverviewShow = true;
- if (this._searchEntry.entry.text != '')
- this._searchEntry.entry.text = '';
+ this._firstSelectAfterOverlayShow = true;
+ this._searchEntry.reset();
if (this._activePane != null)
this._activePane.close();
},
global.overlay_group.add_actor(this._group);
// TODO - recalculate everything when desktop size changes
- this._dash = new Dash.Dash(displayGridColumnWidth);
+ this._dash = new Dash.Dash();
this._group.add_actor(this._dash.actor);
// Container to hold popup pane chrome.
relayout: function () {
let global = Shell.Global.get();
- let contentHeight = global.screen_height - Panel.PANEL_HEIGHT;
+ let screenHeight = global.screen_height;
+ let screenWidth = global.screen_width;
+
+ let contentHeight = screenHeight - Panel.PANEL_HEIGHT;
+
+ let workspaceColumnsUsed = wideScreen ? COLUMNS_FOR_WORKSPACES_WIDE_SCREEN : COLUMNS_FOR_WORKSPACES_REGULAR_SCREEN;
+ let workspaceRowsUsed = wideScreen ? ROWS_FOR_WORKSPACES_WIDE_SCREEN : ROWS_FOR_WORKSPACES_REGULAR_SCREEN;
+
+ this._workspacesWidth = displayGridColumnWidth * workspaceColumnsUsed
+ - WORKSPACE_GRID_PADDING * 2;
+ // We scale the vertical padding by (screenHeight / screenWidth)
+ // so that the workspace preserves its aspect ratio.
+ this._workspacesHeight = displayGridRowHeight * workspaceRowsUsed
+ - WORKSPACE_GRID_PADDING * (screenHeight / screenWidth) * 2;
- this._dash.actor.set_position(0, Panel.PANEL_HEIGHT);
- this._dash.actor.set_size(displayGridColumnWidth, contentHeight);
+ this._workspacesX = displayGridColumnWidth + WORKSPACE_GRID_PADDING;
+ this._workspacesY = displayGridRowHeight + WORKSPACE_GRID_PADDING * (screenHeight / screenWidth);
+
+ let dashY = Panel.PANEL_HEIGHT;
+ this._dash.actor.set_position(0, dashY);
+ this._dash.actor.set_size(displayGridColumnWidth, screenHeight - dashY);
+ this._dash.searchArea.height = this._workspacesY - dashY;
+ this._dash.sectionArea.height = this._workspacesHeight;
+
+ // place the 'Add Workspace' button in the bottom row of the grid
+ this._addButtonSize = Math.floor(displayGridRowHeight * 3/5);
+ this._addButtonX = this._workspacesX + this._workspacesWidth - this._addButtonSize;
+ this._addButtonY = screenHeight - Math.floor(displayGridRowHeight * 4/5);
this._backOver.set_position(0, Panel.PANEL_HEIGHT);
this._backOver.set_size(global.screen_width, contentHeight);
this._transparentBackground.set_position(this._paneContainer.x, this._paneContainer.y);
this._transparentBackground.set_size(global.screen_width - this._paneContainer.x,
this._paneContainer.height);
+
+ if (this._activeDisplayPane != null)
+ this._activeDisplayPane.actor.width = displayGridColumnWidth * 2;
},
addPane: function (pane) {
- pane.actor.width = displayGridColumnWidth * 2;
this._paneContainer.append(pane.actor, Big.BoxPackFlags.NONE);
// When a pane is displayed, we raise the transparent background to the top
// and connect to button-release-event on it, then raise the pane above that.
let backgroundEventId = null;
pane.connect('open-state-changed', Lang.bind(this, function (pane, isOpen) {
if (isOpen) {
+ pane.actor.width = displayGridColumnWidth * 2;
this._activeDisplayPane = pane;
this._transparentBackground.raise_top();
this._paneContainer.raise_top();
this.animationInProgress = true;
let global = Shell.Global.get();
- let screenWidth = global.screen_width;
- let screenHeight = global.screen_height;
this._dash.show();
- let columnsUsed = wideScreen ? COLUMNS_FOR_WORKSPACES_WIDE_SCREEN : COLUMNS_FOR_WORKSPACES_REGULAR_SCREEN;
- let rowsUsed = wideScreen ? ROWS_FOR_WORKSPACES_WIDE_SCREEN : ROWS_FOR_WORKSPACES_REGULAR_SCREEN;
-
- let workspacesWidth = displayGridColumnWidth * columnsUsed - WORKSPACE_GRID_PADDING * 2;
- // We scale the vertical padding by (screenHeight / screenWidth) so that the workspace preserves its aspect ratio.
- let workspacesHeight = displayGridRowHeight * rowsUsed - WORKSPACE_GRID_PADDING * (screenHeight / screenWidth) * 2;
-
- let workspacesX = displayGridColumnWidth + WORKSPACE_GRID_PADDING;
- let workspacesY = displayGridRowHeight + WORKSPACE_GRID_PADDING * (screenHeight / screenWidth);
-
- // place the 'Add Workspace' button in the bottom row of the grid
- let addButtonSize = Math.floor(displayGridRowHeight * 3/5);
- let addButtonX = workspacesX + workspacesWidth - addButtonSize;
- let addButtonY = screenHeight - Math.floor(displayGridRowHeight * 4/5);
-
- this._workspaces = new Workspaces.Workspaces(workspacesWidth, workspacesHeight, workspacesX, workspacesY,
- addButtonSize, addButtonX, addButtonY);
+ /* TODO: make this stuff dynamic */
+ this._workspaces = new Workspaces.Workspaces(this._workspacesWidth, this._workspacesHeight,
+ this._workspacesX, this._workspacesY,
+ this._addButtonSize, this._addButtonX, this._addButtonY);
this._group.add_actor(this._workspaces.actor);
// The workspaces actor is as big as the screen, so we have to raise the dash above it
projects / gnome-shell.git / commitdiff
![data/magnifier.svg](/"http://www.example.com/cgi/"?p=gnome-shell.git;a=blob;f=data/magnifier.svg;h=836ee69986c1e844c42f614d799f5e108748c73f;hb=f00500d3d5a9528735719e503e434f8ea42750c7){kind=link}
![data/view-more-activated.svg](/"http://www.example.com/cgi/"?p=gnome-shell.git;a=blob;f=data/view-more-activated.svg;h=787b1ad6f272708d587909a900d12d7df7df72ee;hb=25a5da074cb3b3b36de05cb7d5665a37020a9dba){kind=link}
![history](/"http://www.example.com/cgi/"?p=gnome-shell.git;a=history;f=data/view-more-activated.svg;hb=25a5da074cb3b3b36de05cb7d5665a37020a9dba){kind=link}
![data/view-more.svg](/"http://www.example.com/cgi/"?p=gnome-shell.git;a=blob;f=data/view-more.svg;h=31af4ee2e1424288d0b0e3120ce26ad22e7b0678;hb=25a5da074cb3b3b36de05cb7d5665a37020a9dba){kind=link}
![history](/"http://www.example.com/cgi/"?p=gnome-shell.git;a=history;f=data/view-more.svg;hb=25a5da074cb3b3b36de05cb7d5665a37020a9dba){kind=link}
![+1,81](/"http://www.example.com/cgi/"?p=gnome-shell.git;a=blob;f=data/magnifier.svg;h=836ee69986c1e844c42f614d799f5e108748c73f;hb=f00500d3d5a9528735719e503e434f8ea42750c7#l1){kind=link}
![a/data/view-more-activated.svg](/"http://www.example.com/cgi/"?p=gnome-shell.git;a=blob;f=data/view-more-activated.svg;h=787b1ad6f272708d587909a900d12d7df7df72ee){kind=link}
![-1,66](/"http://www.example.com/cgi/"?p=gnome-shell.git;a=blob;f=data/view-more-activated.svg;h=787b1ad6f272708d587909a900d12d7df7df72ee#l1){kind=link}
![a/data/view-more.svg](/"http://www.example.com/cgi/"?p=gnome-shell.git;a=blob;f=data/view-more.svg;h=31af4ee2e1424288d0b0e3120ce26ad22e7b0678){kind=link}
![-1,79](/"http://www.example.com/cgi/"?p=gnome-shell.git;a=blob;f=data/view-more.svg;h=31af4ee2e1424288d0b0e3120ce26ad22e7b0678#l1){kind=link}